Bug 566862 – pixbuf_new_from_file does not autodetect format

2009-01-07  Matthias Clasen  <mclasen@redhat.com>

        Bug 566862 – pixbuf_new_from_file does not autodetect format

        * gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing
        without looking at the filename, to avoid breaking expected
        functionality.

svn path=/trunk/; revision=22073

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 1ebcd218412d5f3c6e4736a9ac27696433c63d80..d50d57e48144016942715866ab72c98a97b9bd24 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 566862 – pixbuf_new_from_file does not autodetect format
+
+       * gdk-pixbuf-io.c (_gdk_pixbuf_get_module): Go back to sniffing
+       without looking at the filename, to avoid breaking expected 
+       functionality.
+
 2009-01-01  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.15.0 ===

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index c24d4560661f56c1cd2dcd94c3e5288e4e44bf56..641e7475130797c0245101f10d130874b8c383a0 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -794,7 +794,7 @@ _gdk_pixbuf_get_module (guchar *buffer, guint size,
        gchar *type;
        gint j;
 
-       mime_type = g_content_type_guess (filename, buffer, size, NULL);
+       mime_type = g_content_type_guess (NULL, buffer, size, NULL);
 
        for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) {
                GdkPixbufModule *module = (GdkPixbufModule *)modules->data;